merge trunk
authorK. Handa <handa@gnu.org>
Fri, 26 Apr 2013 14:21:40 +0000 (23:21 +0900)
committerK. Handa <handa@gnu.org>
Fri, 26 Apr 2013 14:21:40 +0000 (23:21 +0900)
commitf576b27cc06a545088be4854fc440b9e30fa320d
treedca8efb0158bb91a7d7145386bd5cbe5ad3e743b
parent06a19c22da64e185f703b0b66feca31cf09a6469
parent4b28c4f52c8ad38e8e1ec352f3dc6f5e66a19eeb
merge trunk